Cleaning up problem 12