small cleanup, event strings are now constants