Add more PEP8 compatible