Some minor improvement to our simulation worker. Also some cleaning up in the process.