[TASK] Replace strings with constants/variables