Refactoring of some methods

Documentation improvements