first steps of cleaning the code