Removing hard coded strings