a couple of refactorings, extended doc
doc++