Refactoring

Refactoring in Cursor with the relevant tests included in context, so the model changes structure while the tests hold behaviour fixed — and you can confirm nothing broke after each step.