Refactor Spree::ShipmentHandler