UK: code refactor
UK: code refactor

hnjamba/onaclone,jomolinare/kobocat,mainakibui/kobocat,kobotoolbox/kobocat,smn/onadata,mainakibui/kobocat,hnjamba/onaclone,kobotoolbox/kobocat,sounay/flaminggo-test,smn/onadata,jomolinare/kobocat,GeoODK/onadata,jomolinare/kobocat,qlands/onadata,piqoni/onadata,spatialdev/onadata,hnjamba/onaclone,kobotoolbox/kobocat,smn/onadata,spatialdev/onadata,GeoODK/onadata,hnjamba/onaclone,sounay/flaminggo-test,spatialdev/onadata,awemulya/fieldsight-kobocat,kobotoolbox/kobocat,sounay/flaminggo-test,spatialdev/onadata,GeoODK/onadata,piqoni/onadata,qlands/onadata,smn/onadata,piqoni/onadata,qlands/onadata,piqoni/onadata,awemulya/fieldsight-kobocat,sounay/flaminggo-test,GeoODK/onadata,awemulya/fieldsight-kobocat,jomolinare/kobocat,mainakibui/kobocat,qlands/onadata,mainakibui/kobocat,awemulya/fieldsight-kobocat