Major refactoring and simplification of QuestionsController and related files