Refactoring + Demo project