Problem 8 cleanup