Incorporating suggestions from pull request.