more refactoring of Itemized Deductions