Cleaning the code part 1