Fix PEP-8 issues