Remove magic const