refactoring, enhanced runner