Improve Javadoc comments