Pricing Done + Tidy Up