Improve creating quiz