simplify class structure
Merge pull request #47 from mneorr/kill_runner

simplify class structure