clean up a couple of things