Votes refactoring

Fixes #226