Finish PEP 257 clean-up, remove unneeded imports, re-arrange others for PEP 8.