Re-factor.