Refactor interpreter runner