Comments and code changes