Vote refactoring