Shipping_total refactoring