Format Enforced & JDK8 proper Javadoc

this code appears built off earlier version of code prior to formatting.
So formatted.
JDK8 javadoc is incorrect.  Fixed it.