Refactoring post demo 1 - First part
Refactoring post demo 1 - Second part