PEP-8 clean-up