cleaning UI up