Code quality improvement.