clean and improve