Refactor DataCustodian in preparation of adding Swagger OAuth 2.0 support