finish comments and tidy up