Address review comments from @bobsilverberg