I agree. I just don't do it by hand. Excel is my friend. Also, I have a worksheet for refi's since an increase unrelated to improvements is not deductible interest.