Cleanup interpreter code a little