Refactor
Merge pull request #1 from SupplementalHealthCare/dev

Refactor