The wall of code without any spaces below here is pretty brutal to read.  Not new in this PR so doesn't have to be fixed, just commenting.