A bit of cleanup and formatting.

Authored by fkristof on Sep 3 2017, 7:47 PM.