PEP8 Clean up