Remove spaces in tuples and use String instead of Regex