Cleans up unused imports and small PEP-8 violations