clean the import a bit

--HG--
branch : feature