Minor code quality updates