reorganizing to match idiomatic Leinengen