Few changes as per the feedback on pull request.