Fix various PEP8 violations

Fix various minor PEP8 violations