incorporating PR review suggestions