chore: address various rerview notes by @rnewson
6 files changed