Refactoring, 3 tests for takeaway in place