A little cleanup was in order