Refactored garage spec