PEP8 and other small changes