Add a quick convenience method and clean up some javadoc