removed uneccessary namespacing and events