code review changes
Merge pull request #1221 from john-hill/SWC-1696-b

code review changes