cleanup a little bit