Cleaned up some event stuff