Some style adjustments
Accessing the field values improperly
Merge branch 'master' into sensu-escalation