Made Question more consistent