Small reorgnization to clean things up