Remove/reindent stray comments