Cleaning the code: Part2