less use of hard-coded strings