chore: address follow-up review feedback from PRs 18, 20, and 21 (#22)

chore: address follow-up review feedback from PRs 18, 20, and 21 (#22) #5