Various fixes

PEP8