Cleaned up imports to pep-0008 recommendation