Extracted wrapper to own file; better terse examples; refactor a bit