check-in code
cleaning the code