Small code cleanup ...