fix indent and remove commented out code