Now with more refactoring! (voting)