Tax2 fix

Updated to reflect tax2 fix in default
General style cleanup