PEP8
PEP8: various corrections