Improved PEP8