minor cleaning

removed unused Event.
some little fixes CS.
moved the domain error into the controller.