Cleaned Up Streaming Entity Simulation