Refactor
Revert glob part 2
And update script
Refactor