Improve CommentController