Code quality adjustments