Clean up and test for comment.