Mozrunner refactor