Code cleanup.
All tests passing.