Re-factor update