Cleaning import and some little improve