VoteService refactoring 2