[FOLD] simplify declarations