+ refactorings & doc