Magic number rid off