Initial PEP 8 fixes