Cleaning up string constants