Minor cleanup.
More work on voting.