Addressed pull request review comments