code cleaning in Progress