Refactoring to sepparate types of votes