Slide 2.1 refactoring + small changes on previous slides

Slide 2.1 refactoring + small changes on previous slides