refactor questionhandler a bit more