PEP8 Fixes
Clean up