PEP-8 compliance fixes