cleaning
code cleaning and beautify