Refactor Comments controller