Minor tidy up.
imports
Fix some Javadoc warnings.