Address @jglick's pull request comments