Refactor the order of the questions