Improve PEP8 compliance