moved the qualifier util code into the qualifier factory, changed the dep request to reduce visibility and simplify usage