Remove substring operation and update argument appearance