Small rearrangements to point out design goals a bit better.