Improved javadoc comments