refactoring the qualifier stuff just a bit