Cleanup a little bit