Add a bit of whitespace and re-order for clarity.

Authored by sstjames on May 10 2016, 3:30 PM.