More code clean