code review changes
worker complete
Merge pull request #1282 from john-hill/PLFM-2730-b

code review changes