doc
Fix and refactoring