Code cleanup, refactor and optimizations
Code cleanup, refactor and optimizations

klightspeed/EDDiscovery,klightspeed/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery