Cleaner and working javadoc...