comments and cleaning up