Some more code cleaning, matching PEP 8