(ALSA QSA) Refactorings