Better PEP8 compliance