Some minor changes regarding code format and Eventcontroller reseting