Code quality fixes
Code quality fixes