cleanup & ocamldoc work
cleanup & ocamldoc work