Tidied up Battle Controllers to respect Events