Addressed Review Comments

Wika, Steve (Contractor) requested to merge sw_review_comments into main Nov 12, 2021