Some refactoring - the name EventHandler is very ambiguous