PEP8 compliance changes