Replace hard coded strings with constants