PEP8 compliance first before major changes