Cleaned up interpreter setup code and separated system state