Improvements due to @jbduncan review.
Improvements due to @jbduncan review.

jbduncan/spotless,jbduncan/spotless,diffplug/spotless,diffplug/spotless,diffplug/spotless,jbduncan/spotless,diffplug/spotless,diffplug/spotless,diffplug/spotless