cleanup - part 2
* Minimized / Optimized some code