Improved styling in line with PEP