cleanUp a bit