More tidy quiz code