Reformat see #69
Fix haddock (link to private function are unknown)