replace strings.Trim by strings.TrimSpace where needed