Clean up question modifier and update specs.
Clean up question validation and update specs.