Improve discussion introduction, reshuffle its organisation