Rewrite #2. All pull request comments addressed. Thanks.