Preparing for better documentation (ii)