more clean up of comments