make the code clean