Refactoring and fixing Docs

No match.