move code cleaned
cleaned