formatting
removed $raw
use Functional\map and fixed tests
adjust docu