minor changes cleanup
minor changes cleanup

(cherry picked from commit fd7f18f8d35aedc932c174967366837f37f3100d)

gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml