A little cleanup