Refactor EventHandler finish
refactor a bit
refactor a bit