A very little cleanup