A little cleanup...