Clean structure and improve