Replaced several hard coded strings with constants and removed an unused import