[FOLD] tidying up