Optimization
Refactoring white spaces