refactoring material and comments votes