Remove duplication in runner code

Fixes #14