Split and reduce the complexity of methods in the runner class