Code refactoring

[xdjinnx]

I don't know if this project is still alive...

But I did some code cleaning of this. And there is much more todo but I will send in a first PR to see if it's wanted at all!

It could be worth testing this before merging. Because the test are broken for me.