Move values into constants