Refactor comments controller