small refactoring
import more questions