Improve Translation y Var substitutution