fix: review comment fixes from 22 to 30