Docs updated. A litte refactoring