Addressing pull request comments #2