Tidying up the draw