move some constant data into actual constants