Making code match PEP8 except for line length