clean up indenting, comments