Whitespace and spacing cleanup
Update missed variable name in 1eb8a6b
Revert accidentally committed testing change