Some time later, a reasonable cleanup made after docs and examples
Simplify more
fixes