refactoring Runner class