beautify,cleanup