Tidy up comments and readme