Refactor vote policy