Garage refactored