Refactor to distinguish better between proposal and comment votes