Light cleaning of the code respecting PEP8. More need to be done.