Refactor Shops