This is just a little cleanup