removed hard coded strings