Cleaning up the flow of questions