clean up for comment and comments