Tidyed up comments and another commit