Implemented suggestions from pull request comments.