Slight refactor for simpler "business logic" (less boilerplate per RR)