Removed hard coded strings
Removed hard coded strings