Some code cleaning, matching PEP 8