Refactor votes