Address feedback from @marycampione