[t458] - review changes
[t458] - review changes

If statement consolidation... sigh.

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