The cleanup looks good, but these variable names could back more suggestive. I'd rename 't_type' to 'accumulating' and 't_scale' to 'transfer_scale' or just 'scale'.