Code review refactoring
Merge pull request #1 from awoods/jms-properties-headers

Code review refactoring