Committed changes addressing code review comments to PR branch. Please have a look at it and let me know if further changes are needed.

Thanks
Venki