Use imports instead of fully qualified class names
Fix Javadoc