make code clean