[SQUASH ME] address comments on PR

Here are the changes from the comments in the original PR in form of a PR.