Minor java cleanups, switch votes to use a VoteType enum