cleaning the code again