Type hint and remove extra str;