Organized some things in EventManager class