Simplify Events.java