Reindent
Change header, remove trailing spaces