Removed ununsed imports, did some PEP-8 cleanup.