Improvements based on comments in the pull request.