Cleaned up interpreter code