Extract merchandize handling from store logic