dry up the credential reporting bit

attempted to DRY up the module a bit for the contributor so
the credential reporting is a little more clear. Hope
this helps.

@pedrib see if this takes care of some of those issues for you.  I hope this will be a little more clear as to what's going on.