Reformat and fix up javadocs cleaning up warnings