Refactored decorators (closes #1029)
Merge pull request #1050 from duke-libraries/1029-decorators

Refactored decorators (closes #1029)