Some cleanup in the javadocs