-- UCCPAR-353, code cleanup to resolve various which jason rectified on comments.
Merge pull request #20 from pradpnayak/UCCPAR-353

-- UCCPAR-353, code cleanup to resolve various which jason rectified on ...