Moved refactor into another PR
Moved refactor into another PR

handiwijoyo/voyager,darit/voyager,fletch3555/voyager,handiwijoyo/voyager,voodoostudio/One_admin,Elyahou/voyager,fletch3555/voyager,davodavodavo3/voyager,darit/voyager,fergthh/voyager,voodoostudio/One_admin,SaadEddinHassania/voyager,the-control-group/voyager,davodavodavo3/voyager,the-control-group/voyager,Elyahou/voyager,akaZorg/voyager,fergthh/voyager,akaZorg/voyager,SaadEddinHassania/voyager