just some minor code improvements