Fix: better detection and handling of votes

* Spacing cleanup