Another small refactor to make the controller a bit less coupled