Simplify event triggers

thanks for cleaning this up