code review changes
Merge pull request #1226 from john-hill/SWC-1702

code review changes