code cleaning
build