Took out comma
Refactored Voting logic to be more DRY
Fixed conflicts