This change does a whole bunch of small cleanups: - Fix up a bunch of issues with indentation, wrapping, and blank lines. - Remove a lot of dead code. - Always use `cls` as the bound variable for class methods. - Add in a few checks and assignments to prevent potentially unbound variable accesses in pathological cases. Testing Done: Ran unit tests.