Small refactor. Cleaned up files. Codebase is now lighter. All tests pass.

8 out of 10 co-workers agree, your desk is the cleanest.