getting rid of possible variable shadowing
update to make things more private
updates to Obj and CalcTax for more security