Adding support for tickers with security type NON-DELIVERABLE IRS SWAP
Tidying up code