Improved javadocs and reformat

3 jobs for issue-979-field in 2 minutes and 4 seconds (queued for 1 second)