fixed lots of PEP8