removed hard-coded strings