current_voter refactor