Some refactoring
More runner