Javadoc and some cleanup (imports), no code change.