Refactoring
Reorganised Assortment-Handling