Small restructure.