Comment and cleanup