Removed Hard coded strings