Clean up code to conform to basic checkstyle

Issue: gh-6078
This commit is contained in:
John Coyne 2018-11-19 21:50:44 -06:00 committed by Rob Winch
parent d05ad19276
commit 14c2d96c86