Fix PEP-8 warnings