done some code formatting optimizations