Some high-quality code changes