code cleaning . added  and  for configuration