Cleanup a little