Cleanup key names