[#1579] Fixed review comments
[#1579] Fixed review comments

robinparadise/videoquizmaker,BBGInnovate/butter,mozilla/butter,mozilla/butter,mbuttu/butter,mbuttu/butter,BBGInnovate/butter,robinparadise/videoquizmaker,mbuttu/butter