Tidy up comments, order of methods