Refactoring discussion and comment controllers