Small changes requested in pull request