some little cleanup