style,cleanup