[#71518308] Refactored code of the demo application