Refactoring: All variables to half way through rename_to_clean properly named. Proceed carefully: next few steps have broken functional tests in the past.
Refactoring: nearly done renaming vars (just main to go, from line 800)
Finished variable names, passing tests
Many more passing tests, currently failing on stripping out whitespace