Added voting
Refactorings