minor code restructuring #290
+25
−16
Merged
Loading