Made the modifications suggested by Andreea in the pull request comments.