Pshtetc quali refactoring