more minor code cleanup