Updating documentation
Updating documentation
some refactoring
some refactoring