Update/refactoring docs