The Spark style is to wrap these statements in braces:

    if (s1 > s2) {
      s = (s2, s1)
    }