Addressing some of the comments in pull request review