Prettier pattern matching

ocaml style, rather than ahem style