PEP8 Conformance test & fixes