Refactoring
Doc