Cleaned up PEP8 violations