Update/refactoring docs
Update/refactoring docs