code review feedback that i meant to include in my last PR