PEP8 and minor changes