Javadoc and code clarity changes.