More code quality improvements.