Updated Today's Refractoring