ID, Name, Comment Tidy up