Refactoring the project demo code (created by lab students), to simpler structure
no message
no message
no message