minor cleanup of API and javadoc