Minor fixes

- Indentation
- Refactoring
- Removing useless comments
- Removing blank lines