Pricing cleanup 73569

This addresses [all the requested pricing model feedback changes](http://pm.tablexi.com/issues/73569#note-34)