Removed Regex complexity to make it simpler