Refactoring in preparation of adding tests
Refactoring in preparation of adding tests

davidroberts63/OctoPygmy,davidroberts63/OctoPygmy,bluefin-octopusdeploy/chrome-extension,bluefin-octopusdeploy/chrome-extension