Improved the javadoc