clean up the code to reduce the nested structures
clean up the code to reduce the nested structures

DXCanas/kolibri,mrpau/kolibri,DXCanas/kolibri,learningequality/kolibri,learningequality/kolibri,learningequality/kolibri,mrpau/kolibri,benjaoming/kolibri,lyw07/kolibri,DXCanas/kolibri,indirectlylit/kolibri,benjaoming/kolibri,mrpau/kolibri,indirectlylit/kolibri,mrpau/kolibri,learningequality/kolibri,benjaoming/kolibri,lyw07/kolibri,indirectlylit/kolibri,benjaoming/kolibri,indirectlylit/kolibri,DXCanas/kolibri,lyw07/kolibri,lyw07/kolibri