Refactoring, docs