Refactoring Comments module.