A little cleanup first