Refactor parser about NUMBER