Getting rid of constants