Replace constants with "regular" variables

There is no need to use constants