Removed stringr depdendency