Refactor runner class for clarity