minor -- code cleanup