DIAG: improve readability
DIAG: fix haddock comment