Code cleanpu (2)