tidy up, fixed $comment keep adding comments