A little cleanup from the last big commit