PEP8: various fixes