More refactoring
More refactoring

APerson241/EnterpriseyBot,APerson241/APersonBot,APerson241/EnterpriseyBot,APerson241/APersonBot,APerson241/APersonBot,APerson241/EnterpriseyBot,APerson241/APersonBot,APerson241/EnterpriseyBot