[NX-358] Doc/Tidy