Improve haddock comments