Some more cleanup, as I ready this for the world...