Included 2-round of reviewer's comments (will squash this commit once the PR is ready to be merged)