Tech Debt: refactor to make voting simpler and easier to understand