Removing hard-coded strings