nit: next time, might be nice to have these cleanup changes in a separate commit (same PR, but two commits), just to make review easier