Docs / refactoring