beginning test-driven cleanup