Slide 2.2 refactoring

Slide 2.2 refactoring