Improvements for voting example