code review comments from @jclulow