Minor optimizations and cleaning #1503
+150
−176
Open
Loading