refactor zypp handling