Further refactor Event and Vote controllers