Fixed doc
Refactoring