code clean-up
Merge branch 'master' of https://github.com/adelapie/irma_phase_2