minor clean up
Fixed some elements of swaps valuation