some refactoring
Merge branch 'ccda-generator' of https://github.com/amida-tech/blue-button into ccda-generator