code cleaning
initial code