cleaning up some checkstyle violations

Trivial pull request, addresses some checkstyle findings  that were overlooked during some earlier commits that have already been merged into master.