Warehouse small refactoring.