Tidying up the draw json