minor code cleanup ...