Remove excessive comment and newline