fixed events methods to adhere to standard re splitting up methods into their constituent parts