* Refactoring
* Documentation