Cleaning the code: Part2.1