Updated w/ suggestions from pull request.