refactor AutoShop