Refactor code to eliminate implementation and design smells.

[bblywater]

Minor refactoring code attempts.

[rabelenda]

Hello, thank you very much for this PR!

We really appreciate all sort of contributions, in particular PR. Thank you for taking the time to invest on understanding existing code, thinking on ideas for improvement, and providing the code improvements.

I have left some comments, I hope you can review them and comment or adapt as necessary so we can include the changes ASAP.

Regards and thank you again.

[rabelenda]

Since we haven't received any feedback to the review comments, and since the PR adds too many files which are not necessary, I am closing this PR. Feel free to send a new one without the unnecessary files.