Problem 24
Comment and cleanup