Better naming.
Cleanup work on 10.000 files, some test-code.
More throw-away code.
Cleanups.