Some code clean