4690569 update with comments from code review

Authored and Committed by dustymabe 6 years ago
    update with comments from code review