Fix some issues that PEP8 found