Change the usage of constants with their values