refactoring to prep for analysis work
Merge pull request #1253 from devoncarew/devoncarew_service_refactor2

refactoring to prep for analysis work