Just a little cleanup