VoteService refactoring