Making scripts easier to write

Making scripts easier to write for CI