Factored some code, injected more components into CommandRunner instead of creating