Adressing pull request comments