Get rid of duplicate number lookup and strings