Tidy up whitespace and newline at end of file