just some minor code cleanup