Small refactor
Small refactor

wookiehangover/hapi,camerow/hapi,hulbert/hapi,wookiehangover/hapi,HugoRLopes/hapi,danielb2/hapi,Binarytales/hapi,elnaz/hapi,zhoujia123/hapi,pandeysoni/hapi,hulbert/hapi,Marsup/hapi,bells17/hapi,bbondy/hapi,rodfernandez/hapi,DJMcK/hapi,aulvi/hapi,rodfernandez/hapi,julianduque/hapi,jrmce/hapi,toboid/hapi,StudyForFun/hapi,youprofit/hapi,aulvi/hapi,cesarmarinhorj/hapi,evdevgit/hapi,jefflembeck/hapi,bbondy/hapi,rmoorman/hapi,vertiman/hapi,DJMcK/hapi,SimonLab/hapi,elnaz/hapi,Eric013/hapi,bells17/hapi,toboid/hapi,wzrdtales/hapi,udhayam/hapi,credosam/hapi,rmoorman/hapi,jefflembeck/hapi,jrmce/hapi,StudyForFun/hapi,pandeysoni/hapi,ldesplat/hapi,papimomi/hapi,youprofit/hapi,papimomi/hapi,wzrdtales/hapi,Binarytales/hapi,SimonLab/hapi,zhoujia123/hapi,analytically/hapi,ryanmurakami/hapi,julianduque/hapi,Eric013/hapi,cesarmarinhorj/hapi,shalomabitan/hapi,udhayam/hapi,elnaz/hapi,ryanmurakami/hapi,deepakshrma/hapi,analytically/hapi,ClaudeHarry/hapi,pandeysoni/hapi,credosam/hapi,danielb2/hapi,ClaudeHarry/hapi,camerow/hapi,HugoRLopes/hapi,shalomabitan/hapi,deepakshrma/hapi,Marsup/hapi,evdevgit/hapi,ldesplat/hapi,vertiman/hapi