[FOLD] Refactor