refactored some things started event handling