Refactor vote view code and references