PEP8 and small code cleaning.