separate pre_tax_total from Baske#compute; add Basket instance variables