Magic number elimination