Incremental improvements to Quiz code