Refactoring on the comment module