Javadoc cleanup, event implementation