PollsVotes refactored