cleaning UI code