Voting: Refactor models.