Updated as per pull request comments