more consolidation/optimization of qt classes