Improved Javadoc comments