Refactor e -> event