Style refactoring
Fixed indenting
More aggressive optimization
Reformatted
Refactored!