Clean up Question a bit