Fix and  code clean