Refactoring

EventToCommand removed