fix broken runner, refactoring