Javadoc and API cleanup