Tidied up exactly what we are doing with run_id partitioning