Factorize code
Lesson 7 almost ready
Lesson 7 ready