[FOLD] move members, tidy