Tidy up comments and indenting