Clean up the string keys