UC-54 Suggested updates for current pull request

Removed as we're using new style lambda function syntax.