minor
created runner class, some refactorings