Refactor complete; no matching, fixtures and tests yet