Refactoring as well as the Event system without javadocs