simplified and consolidated
remove string manipulation