Removed hard-coded strings