QoL: Improve/Refactor existing code

[ivanseed]

The code is rushed and messy. If you have any improvements feel free to contribute better design patterns.

[pvsousalima]

I can start looking into it :D

[rafaelklaessen]

I'm looking into it as well :)