Preparing for better documentation (iii)