tidying up event/method names