rewrap/reindent to make more readable
Dealing with technical debt found via SQ
Reformat code using SQ standard; deal with techn. debt found by SQ