Comment and code changes