Some rearranging and consolidation of interpreter (trivial)