Refactoring of Quiz charts drawing