minor code cleanup in files