Addressed CodePro issues
code review changes
Merge pull request #143 from bkng/master

Addressed CodePro issues