Adressed pull request comments