code cleaning
beautify