Addressed some pull request comments