doc - more refactors