code cleaning
change location