votes more refactoring