Refactored sub question ordering [Iteration 2]