clean up some magic strings by replacing with constants