More code quality improvements.
More code quality improvements.