changes based on code review feedback
Merge branch 'snsImprovements' of github.com:claymccoy/asgard into snsImprovements