Minor cleanup

Organized imports
PEP compliance cleanup