doing a little cleanup