Light refactoring
Doc