Mozrunner refactor
Cleanup stuff