Better support of PEP8