Pattern Refactor

Refactor [target code] to use the [design pattern] pattern, following conventions already present in this codebase. Keep the diff minimal, preserve behavior, and update affected tests.