votes refactoring