more refactoring
more refactoring

berezovskyi/nikola,gwax/nikola,knowsuchagency/nikola,jjconti/nikola,TyberiusPrime/nikola,x1101/nikola,berezovskyi/nikola,servalproject/nikola,xuhdev/nikola,okin/nikola,atiro/nikola,wcmckee/nikola,andredias/nikola,immanetize/nikola,jjconti/nikola,getnikola/nikola,yamila-moreno/nikola,lucacerone/nikola,wcmckee/nikola,okin/nikola,Proteus-tech/nikola,JohnTroony/nikola,masayuko/nikola,xuhdev/nikola,pluser/nikola,atiro/nikola,JohnTroony/nikola,knowsuchagency/nikola,okin/nikola,lucacerone/nikola,kotnik/nikola,xuhdev/nikola,knowsuchagency/nikola,yamila-moreno/nikola,s2hc-johan/nikola,x1101/nikola,damianavila/nikola,masayuko/nikola,yamila-moreno/nikola,TyberiusPrime/nikola,kotnik/nikola,servalproject/nikola,schettino72/nikola,Proteus-tech/nikola,xuhdev/nikola,getnikola/nikola,lucacerone/nikola,getnikola/nikola,atiro/nikola,schettino72/nikola,getnikola/nikola,pluser/nikola,damianavila/nikola,TyberiusPrime/nikola,wcmckee/nikola,x1101/nikola,masayuko/nikola,s2hc-johan/nikola,andredias/nikola,pluser/nikola,damianavila/nikola,techdragon/nikola,techdragon/nikola,kotnik/nikola,immanetize/nikola,Proteus-tech/nikola,s2hc-johan/nikola,gwax/nikola,immanetize/nikola,berezovskyi/nikola,okin/nikola,gwax/nikola,servalproject/nikola,JohnTroony/nikola,schettino72/nikola,andredias/nikola,Proteus-tech/nikola,techdragon/nikola,jjconti/nikola