Code review changes from PR/58