Doc
Refactoring week 3.5