+ Refactor interpreter class