Addressing pull request code review comments