Got rid of hard-coded string