Improve PEP8 conformance