Improve PEP 8 compliance