Undid string extractions (unnecessary complicatedness at this time)