Minor javadoc improvements and import cleanup