Code Cleanup/new events.