Reuse helpers, move to separate file, refactor run scripts