LANG-701 Made changes based upon comments from pull request