Remove commented lines; fix indentation