Small bits of reorganizing.