Make PEP8 happier and remove some unused imports (very minor changes)