Major refactorings

[josojo]

I tried to make the code more readable and adapt it to some common patterns.

The code looks different because I run a linter and did some variable renaming for better readability.

There is no logic change involved