Simple refactorings

I find making a few refactorings a good way of getting a proper grip on a library. Use if you want, feel free to discard.

Regards