removing the hard coded strings