Improving merged code by applying the OOP approach for V0.0 Demo