Stylistic fixes (PEP 8)