provorg: refactor + fixup