Commit 09497c1a734cfb22e9d4f1d0b390fa7901c46faa

DRC 2018-03-16T18:20:05

Additional code formatting tweaks Missed by previous analysis