Get rid of constants