Improve Code Structure and Fix Warnings

[PSchmiedmayer]

Improve Code Structure and Fix Warnings

:bulb: Proposed solution

This PR improves the code structure and fix several warnings in the code.

Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

• [x] I agree to follow the Code of Conduct and Contributing Guidelines.