Code quality adjustments
Code quality adjustments