Problem 22 cleanup