Further cleanup of Problem 14