cleaning the code part 1
cleaning the code part 2