simplify Question model a bit