formatting,cleanup