Cosmetic indentation & factoring changes
Array.create -> Array.make to make my Ocaml 4.02 happy