A little clean up for how the world and drawing works.