PEP8 clean up;