current_voter inclusion refactor