PEP-8 and formatting fixes