Refactor of comments controller to be more dry