Remove magic number