Address pull request comments from @tpitale