Docs, refactoring
Docs, refactoring