Refactoring the scripts…