Blue and Blue Shop - Refactor