minor haddock cleanup