more refactoring on core runner