remove extra comments, change indentation