Did some refactoring and implemented question skipping