[FOLD] tidying