OCamlPro: reviewed the changes as per PR comments