Refactoring + doc