* Improved PEP8 compliance