Minor API cleanup and javadoc