Refactoring garage and van methods