Do lots of re-factoring (code was written as p.o.c. in a big rush).

**Describe the task**
A clear and concise description of what the task is.

**Acceptance Criteria**
- [ ] first
- [ ] second
- [ ] third

**Additional context**
- Add any other context about the task here.
- Or here

The issue names no files, tests, entry points, or concrete refactoring target; its acceptance criteria are still placeholders. First map the code areas covered by the proof of concept and establish a specific scope and completion criteria before starting, then identify the relevant tests to run.

Written by the indexing model from the issue text.