Remove some commented code and indentation fix