little cleanup an fix