Replaced strings with constants as suggested