Replaced some strings with constants