Cleanup a bit