Tidy up whitespaces and long lines