Your question is Refactoring a Codebase. Take a moment with it on the right.
Talk me through your thinking if you like. When you're confident, submit your answer and I'll grade it like a real screen (7/10 or better passes).
Show me parts of the codebase and explain how you would help them refactor it.