Fixed coding style + indentation bugs