Changes made as per the feedback on pull request.