cleanup a bit