Cleaning up Problem 1