doc / refactoring