- A little cleanup