Tidy up comments and rating