Minor refactor of draw_submissions() that ended up useless