Fix new_comment, tidy up code