Code quality improvements.