Minor refactoring
Merge branch 'master' of https://github.com/Groupe-Atallah/MQ