comments and tidy up