Refactoring indentations and comments