Javadoc comments improved