More cleanup.
Trying to limit the number of variables we use to analyze the world.