clean up n fix up