Remove Magic Number