Clean up a couple of things