Cleaning the code (#2)