Removed hard coded strings