code cleaning
merge