Cleaned up event handling/sending