cleaned up a couple of things