Class comments and tidy up