Comment and cleanup code