Voting/issues/3
refactoring