-Javadoc improved