Improved compatibility with PEP8