Minor tidying up of drawing