Addressed comments in Pull Request