Reduced the number of questions to 4 and refactoring