[FOLD] refactor