Code cleanings and PEP8 violations fixes

Just some minor PEP8 violations fixes and some code cleanings to take a first contact with the code and the new architecture