Small refactoring, doc