Using the cleaner event interface to clean up some code