PEP8 and formatting