refractoring and comments
Merge github.com:pedroabreu/quizzard