Refactor sorts Questions