[Delivers #43979433] Refactor the scripts