Small refactor
Small refactor

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