code review changes
Merge pull request #1302 from john-hill/PLFM-2789

code review changes