def cleanUpKeyValuePair(rawKey, rawValueStr):
  """
  Given a raw key and a raw value string, clean them up and
  remove a leading "-" if necessary.
  """
  paramStr = rawValueStr.strip()
  key = rawKey.strip().strip('-')
  return key, paramStr