Magic Number removal.