Submission moved to a separate method; run and collate rewritten to use that method